PAPR: migrate to the new name

The redhat-ci service has been renamed to PAPR. Previous values are
still supported though should be considered deprecated.

Closes: #885
Approved by: cgwalters

diff --git a/.papr.Dockerfile b/.papr.Dockerfile
new file mode 100644 (file)
index 0000000..0081998
--- /dev/null
+++ b/.papr.Dockerfile
@@ -0,0 +1,27 @@
+FROM fedora:25
+
+RUN dnf install -y \
+        gcc \
+        git \
+        sudo \
+        which \
+        attr \
+        fuse \
+        gjs \
+        parallel \
+        coccinelle \
+        clang \
+        libubsan \
+        libasan \
+        libtsan \
+        PyYAML \
+        gnome-desktop-testing \
+        redhat-rpm-config \
+        elfutils \
+        'dnf-command(builddep)' \
+ && dnf builddep -y \
+        ostree \
+ && dnf clean all
+
+# create an unprivileged user for testing
+RUN adduser testuser

diff --git a/.papr.yml b/.papr.yml
new file mode 100644 (file)
index 0000000..cc02f75
--- /dev/null
+++ b/.papr.yml
@@ -0,0 +1,187 @@
+branches:
+    - master
+    - auto
+    - try
+
+required: true
+context: f25-sanitizer
+
+container:
+    image: projectatomic/ostree-tester
+
+packages:
+  - libasan
+  - git
+  - coccinelle
+
+env:
+    CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
+    ASAN_OPTIONS: 'detect_leaks=0'  # Right now we're not fully clean, but this gets us use-after-free etc
+    # TODO when we're doing leak checks: G_SLICE: "always-malloc"
+
+build:
+    config-opts: >
+      --prefix=/usr
+      --libdir=/usr/lib64
+      --enable-installed-tests=exclusive
+      --enable-gtk-doc
+
+# The g-d-t-r timeout is for test-pull-many.sh; if tweaking this,
+# also be sure to change the other cases below
+tests:
+    - make syntax-check
+    - ./tests/ci-commitmessage-submodules.sh
+    - make check
+    - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
+
+timeout: 30m
+
+artifacts:
+    - test-suite.log
+
+---
+
+inherit: true
+required: true
+
+context: f25-clang
+
+env:
+    CC: 'clang'
+    CFLAGS: '-Werror=unused-variable'
+
+tests:
+artifacts:
+
+
+---
+
+inherit: true
+
+context: f25-rust
+
+packages:
+  - cargo
+
+build:
+    config-opts: >
+      --prefix=/usr
+      --libdir=/usr/lib64
+      --enable-gtk-doc
+      --enable-rust
+
+env:
+    CC: 'gcc'
+
+tests:
+    - make check TESTS=tests/test-rollsum
+
+artifacts:
+  - test-suite.log
+---
+
+inherit: true
+
+context: f25-experimental-api
+
+build:
+    config-opts: >
+      --prefix=/usr
+      --libdir=/usr/lib64
+      --enable-gtk-doc
+      --enable-experimental-api
+
+env:
+    CC: 'gcc'
+
+tests:
+    - make check
+    - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
+
+artifacts:
+  - test-suite.log
+---
+
+inherit: true
+required: true
+
+context: f25-curl-openssl
+
+packages:
+  - pkgconfig(libcurl)
+  - pkgconfig(openssl)
+
+build:
+    config-opts: >
+      --prefix=/usr
+      --libdir=/usr/lib64
+      --enable-installed-tests=exclusive
+      --enable-gtk-doc
+      --with-curl
+      --with-openssl
+
+tests:
+  - make check
+  - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
+
+artifacts:
+  - test-suite.log
+
+---
+
+inherit: false
+branches:
+    - master
+    - auto
+    - try
+
+context: f25ah-insttest
+required: false
+
+cluster:
+  hosts:
+    - name: vmcheck
+      distro: fedora/25/atomic
+  container:
+    image: projectatomic/ostree-tester
+
+build:
+    config-opts: >
+      --prefix=/usr
+      --libdir=/usr/lib64
+      --enable-gtk-doc
+
+# Copy the build from the container to the host; ideally down the line
+# this is installing an RPM via https://github.com/jlebon/redhat-ci/issues/10
+tests:
+  - make install DESTDIR=$(pwd)/insttree
+  - rsync -rl -e 'ssh -o User=root' . vmcheck:ostree/
+  - ssh root@vmcheck './ostree/tests/installed/fah-prep.sh && ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh'
+
+artifacts:
+  - test-suite.log
+
+---
+
+inherit: false
+branches:
+    - master
+    - auto
+    - try
+
+context: f25-flatpak
+required: false
+
+# This test case wants an "unprivileged container with bubblewrap",
+# which we don't have right now; so just provision a VM and do a
+# docker --privileged run.
+host:
+  distro: fedora/25/atomic
+  specs:
+    ram: 4096  # build-bundle is a static delta, which needs RAM right now
+
+tests:
+  - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:25 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
+
+artifacts:
+  - test-suite.log

diff --git a/.redhat-ci.Dockerfile b/.redhat-ci.Dockerfile
deleted file mode 100644 (file)
index 0081998..0000000
--- a/.redhat-ci.Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM fedora:25
-
-RUN dnf install -y \
-        gcc \
-        git \
-        sudo \
-        which \
-        attr \
-        fuse \
-        gjs \
-        parallel \
-        coccinelle \
-        clang \
-        libubsan \
-        libasan \
-        libtsan \
-        PyYAML \
-        gnome-desktop-testing \
-        redhat-rpm-config \
-        elfutils \
-        'dnf-command(builddep)' \
- && dnf builddep -y \
-        ostree \
- && dnf clean all
-
-# create an unprivileged user for testing
-RUN adduser testuser

diff --git a/.redhat-ci.yml b/.redhat-ci.yml
deleted file mode 100644 (file)
index cc02f75..0000000
--- a/.redhat-ci.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-branches:
-    - master
-    - auto
-    - try
-
-required: true
-context: f25-sanitizer
-
-container:
-    image: projectatomic/ostree-tester
-
-packages:
-  - libasan
-  - git
-  - coccinelle
-
-env:
-    CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
-    ASAN_OPTIONS: 'detect_leaks=0'  # Right now we're not fully clean, but this gets us use-after-free etc
-    # TODO when we're doing leak checks: G_SLICE: "always-malloc"
-
-build:
-    config-opts: >
-      --prefix=/usr
-      --libdir=/usr/lib64
-      --enable-installed-tests=exclusive
-      --enable-gtk-doc
-
-# The g-d-t-r timeout is for test-pull-many.sh; if tweaking this,
-# also be sure to change the other cases below
-tests:
-    - make syntax-check
-    - ./tests/ci-commitmessage-submodules.sh
-    - make check
-    - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
-
-timeout: 30m
-
-artifacts:
-    - test-suite.log
-
----
-
-inherit: true
-required: true
-
-context: f25-clang
-
-env:
-    CC: 'clang'
-    CFLAGS: '-Werror=unused-variable'
-
-tests:
-artifacts:
-
-
----
-
-inherit: true
-
-context: f25-rust
-
-packages:
-  - cargo
-
-build:
-    config-opts: >
-      --prefix=/usr
-      --libdir=/usr/lib64
-      --enable-gtk-doc
-      --enable-rust
-
-env:
-    CC: 'gcc'
-
-tests:
-    - make check TESTS=tests/test-rollsum
-
-artifacts:
-  - test-suite.log
----
-
-inherit: true
-
-context: f25-experimental-api
-
-build:
-    config-opts: >
-      --prefix=/usr
-      --libdir=/usr/lib64
-      --enable-gtk-doc
-      --enable-experimental-api
-
-env:
-    CC: 'gcc'
-
-tests:
-    - make check
-    - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
-
-artifacts:
-  - test-suite.log
----
-
-inherit: true
-required: true
-
-context: f25-curl-openssl
-
-packages:
-  - pkgconfig(libcurl)
-  - pkgconfig(openssl)
-
-build:
-    config-opts: >
-      --prefix=/usr
-      --libdir=/usr/lib64
-      --enable-installed-tests=exclusive
-      --enable-gtk-doc
-      --with-curl
-      --with-openssl
-
-tests:
-  - make check
-  - /bin/sh -c 'gnome-desktop-testing-runner -p 0 --timeout $((10 * 60)) libostree/'
-
-artifacts:
-  - test-suite.log
-
----
-
-inherit: false
-branches:
-    - master
-    - auto
-    - try
-
-context: f25ah-insttest
-required: false
-
-cluster:
-  hosts:
-    - name: vmcheck
-      distro: fedora/25/atomic
-  container:
-    image: projectatomic/ostree-tester
-
-build:
-    config-opts: >
-      --prefix=/usr
-      --libdir=/usr/lib64
-      --enable-gtk-doc
-
-# Copy the build from the container to the host; ideally down the line
-# this is installing an RPM via https://github.com/jlebon/redhat-ci/issues/10
-tests:
-  - make install DESTDIR=$(pwd)/insttree
-  - rsync -rl -e 'ssh -o User=root' . vmcheck:ostree/
-  - ssh root@vmcheck './ostree/tests/installed/fah-prep.sh && ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh'
-
-artifacts:
-  - test-suite.log
-
----
-
-inherit: false
-branches:
-    - master
-    - auto
-    - try
-
-context: f25-flatpak
-required: false
-
-# This test case wants an "unprivileged container with bubblewrap",
-# which we don't have right now; so just provision a VM and do a
-# docker --privileged run.
-host:
-  distro: fedora/25/atomic
-  specs:
-    ram: 4096  # build-bundle is a static delta, which needs RAM right now
-
-tests:
-  - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:25 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
-
-artifacts:
-  - test-suite.log

diff --git a/tests/ci-commitmessage-submodules.sh b/tests/ci-commitmessage-submodules.sh
index 8ce077c3613df4682f3e87478cf907422257381b..aeccc24d826f767a32eff83e0711f245f8cd7c1e 100755 (executable)
--- a/tests/ci-commitmessage-submodules.sh
+++ b/tests/ci-commitmessage-submodules.sh
@@ -13,9 +13,9 @@ set -euo pipefail
 # It's very common for people to accidentally change submodules, and having this
 # requirement is a small hurdle to pass.
 
-# if running under RHCI, use the branch/PR HEAD actually
+# if running under PAPR, use the branch/PR HEAD actually
 # being tested rather than the merge sha
-HEAD=${RHCI_COMMIT:-HEAD}
+HEAD=${PAPR_COMMIT:-HEAD}
 
 tmpd=$(mktemp -d)
 touch ${tmpd}/.tmpdir